bitkeeper revision 1.829 (4064473cafXxoOK98baBKebIaWblgA)
authoriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Fri, 26 Mar 2004 15:07:40 +0000 (15:07 +0000)
committeriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Fri, 26 Mar 2004 15:07:40 +0000 (15:07 +0000)
Merge tetris.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into tetris.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk

1  2 
xen/include/hypervisor-ifs/dom0_ops.h

Simple merge